rm some obsolete comments/code
unfuck indentation