Cut out even more crap