Remove category check