Clean up descriptions somewhat

Also remove some things made redundant by last commit.