Deleted old, unnecessary comments and unused methods