removed logic cruft