Temp removal to avoid merge issues