clean up hacky patch