rips out some uneeded code