kicked out some useless code