Revert "Border, Gun Positioning"

This reverts commit ec810dfb642f3a847281a1df3d1b4dd04b1fe210.