Removed loki

Change-Id: I97de8130cf81cc1ab55c4d3d2d6492a96b40e051