cleaned up some comments and garbage collected features i'm not using anymore