clear() and cleanup fixes
stuff