Move necessary check to superclass and remove unnecessary checks