clean up, make host optional