Remove unneeded checks
Use additional checks