Tidy up user storeis