Rethink user model, cleaning stuff