cleaned up uneeded imports and commented out code