Merge "Remove unnecessary checks already coverd in schema"