cleaning up themes service