butterfly - cleanup orientation handler and needle