Clean up Account Controller