General Clean Up

Some general clean up tasks.