Removed dependencies

Change-Id: I8234f2f9db1dd51fe552f2ee571dbe41a0d08394