taking out conditionals so that our stuff shows up
taking out more cruft