Cleanup effort

Cleanup effort