removed unused/non-working code