Howard/cleanup