Remove old input wrapper
Fix order of object scaling/translation