Removing included cruft that's not used and fixing regression in logic.js