Clean up existing code