[GEAR] Cleanups
[GEAR] changes