Clanker Cleanup

Clanker Cleanup