Remove module check boiler plate