Cleanup: remove already initialized variables