botch: Cleanup

Revision 1016
Cleanup
Committed By Garry Newman