LPS-33236 Partial removal of categories