remove some code bloat