removed dirty code