I think this is not needed anymore. Remove it?