Cleaned up some more stuff