Add clear and cleanup implimentation