Clean up code

* removed commented out code