Removed sanity checks