Removed some annoying tests on the pre_execute phase