Cleanup what gets exposed