2014 cleanup, added npm