Refactor remove redunant System.getProperty