Removed Unused paths and clean code.