Cleaned up unneeded values