added cleanup() calls