rm user stuff in prep for merging ians stuff