De-exposed user models & basic clean up