got rid of some of the bloat that's not needed