removed duplicate cleanup method