removes straightjacket

Straightjacket doesn't do anything that handcuffs don't do, and is a maintainability issue
fixes #3428