Cleaned up more stuff.