Clean up Controller