removed many functions