initial clean up, not there yet