Category memory management

x