some cleaning of unnecessary stuff