right b4 final cleanup