Cleanup and sync with phphSlcikGrid