cleaning up misc. work