removed some dirty code