Structure cleanup but there is a long way to go.