Clean up before adding new methods