removed commented out code throughout app