Cleanup: based on RC3