Code cleanup, no functional changes

Removed some legacy commented code that was being used for reference +
redundant code across files.