Remove unused classes (added by mistake). Fix access validation. Button up integration with User.