Removed Category Screen and associated classes