Removed a lot of diversity stuff

Comments