clean up on team
Merge branch 'newhome' into testing