Initial attempt at cleanup.