Janitor - remove unsed variables