Removing some ugly code.