Remove ghetto code