removed commented blocks