finished removing code bloat