Clean up implementation of User stuff