Remove init function and reference to element in controller.  Other general cleanup.