Remove the terrible code of terribleness