remove 2 stupid functions