Removed stale redundant code