changed: Improved logic for previous commit a bit + remove some code that would never be hit