Cleaning up existing code.