Cleanup pre28

Cleanup updates