Removed Yeoman, simplified code