clean ups, deleted old commented out code