Starting to clean up

Much more to do