Revert "Wanted+ Tweaks"

This reverts commit 5ec86e78f6dd20133a202e667d40e29aa6e76739.