Some other optimization + autocleanup