Remove stuff moved into angular controller for now