more fixes. some useless code removed