Cleaned up the remaining figures