Revert "few more minor fixes, should fix clearpocket and reduce target bouncing even more"

This reverts commit 112d7708f2d830abefd81db5f76b5da7b67a42c1.