[#580] Code cleanup

Remove unused imports and commented out code.