Removed Traps

cuz fuck those guys
Merge remote-tracking branch 'origin/master' into lockhart