Complete corporate clean-up

Completed on
Discussion
@medeana Sounds scary! What are you cleaning?