Prepare for updating portage-stable and some cleanups