Make System properties available as static finals
Use System.clearProperty instead of System.getProperties().remove