removed orphan code