Removing dirty code