cleanup, but still broken