Cleanup and bump to 28.0-2