Remove even more stupid checks