fix problems and removed completely way form