Remove orphaned code