Removed test comments and warns