Cleanup commit, removing commented code