Removing Forwardable usage

This is no longer needed