Remove } hack and copy paste errors