some simple clean up