initial clean up
initial cleanup