Removed some sanity checks that were now redundant due to form checking