clean up mostly