Clean up activated guards

* Added some additional guards
* Removed some unneeded guards from the logic