Remove button update code, FIX later