Revert "added some more logic, or illogic"

This reverts commit 4b607bce349c621c2e90a6a01dde33325eb949cb.

Some things got messed up