Removed Equinox-dependencies