Updated copyrights and removed some obosolete #defines