cleaning, remove obsolote stuff