Removed orphan code