Completely working cleanup