Add header comment and remove old test code