Cleaned up many things.