Remove references to ButtonView