Code

excise never-used code and stale comments