These checks are a bit heavy handed, so removing