Revert "Fixed some problems in control and copyright files"

This reverts commit 2e6062c5af4a873818e75ffb27a24d317e85ef1f.