Remove unnecessary code and (re-)add some more compile time constants

Remove unnecessary code and (re-)add some more compile time constants #2918