Clean up and migrate to neobundle