Removing extremely stupid backward compatibility code