Cleanup user building a little bit