Fix for incorrectly named cleanup method