Remove unused stuff
Also work with last name