Get rid of terrible code!