Cleanup comments, remove unused code