cleaned up commented out code throughout the application