replaced throw(err) | comments in users.js missing
loads of commenting and cleanup