cleanup demo code
enable categories