clean up code warnings - organize imports and elim unused code