more dirty code removal