Removed self and duplicate dependencies

Change-Id: If5c7ce59162bd28a2fd7eba74b270331ecb1fe6f