Add cleanup feature