some cleanup for installer build