Misc code and project cleanup.