Remove dead / duplicated code