Finished migrating to neobundle