added but then commented out cleanup method, fixed bug