Clean up - concentrate on the house code

See title.