Couple code fixes before Midterm Demo

Removed shield push back feature. It is not ready.