Overall Clean up.