Remove dead code and remove redundant explicit true/false returns
Try and keep spirit of keeping code a little closer to ECMA algo