Some warning removed