More Cleanup

Done!