General Cleanup

closes #10