Cleanup comment and unused code