Removed commented out lines