Remove unused code

Those are features added long time ago, without being used. If we need to use them in the future we can re-enable them. Remove them since they are not used.