Cleanup by boskee

Cleanup by boskee