Remove references to standalone