Refactored removing / .