cleaning up theme