Remove the stupid checking support