removing bloat code