Major clean up.