Cleanup

Major changes....