change the license headers to EPL and remove some dead code