Remove references support for good