Cut out some unnecessary bloat