Cleanup: remove obsolete variables