Remove a lot more unused code or if statements that turned out to always be true (useless if's)