got rid of useless code that was messing things up