Clean up

Starting fresh