Change some method signatures and remove test code.