Cleaning up my theme