Clean up code and comment code out