Removing old el-api dependency