Edited comments, deleted some dead code