[DEV] Cleanup & RCS tuning