Revert "Company Controller"

This reverts commit 20bcd1d1a8d5415d3c2b3b3b6654de53b17de714.