Cleanup

In by Randy Roguski