cleaning up for new theme