Get rid of undesirable code that i think