Removed warnings/ org imports, etc