fixing broken aws/eb deploy
Fix new user flow
Can't remove all listeners from the options object
fixed renaming functions