remove hard-code stuff