Cleaned up no longer used stuff.