More cleaning up

Deleted old code