removed commented old parts