removing dirty code