[AH-343] Fixes for hard coded stuff -> moved to properties/removed unnecessary