Edited comments, removed unused code