Cleaned up most of the things.