Cleaned up non-working code