Cleanup
Fix G53, cleanup