Took away some crap that wasn't working