Removed format check