Clean up controller methods