Remove entity + component code