Fixed a bunch of shield bugs and removed old code that shouldn't have been there anymore