Cleaned up some unused things.