Cleanup and bartik theme