useless things deleted
more fixes