Some main package cleanup.