Cleanup

Cleaned up unused information.