Remove orphan code