Cleaned up gross redundancies.