Cleaned up unused stuff.