Removed non-working code