Code clean up and remove copy-write statement.