Cleanup, use references from the Items class instead of the ones in the common mod proxy.