Cleanup prior to moving to Neobundle