WIP adding cleanup routine