cleaned up code

erased commented/incomplete code