Remove unhelpful comments
Remove depcrated flags where code is still needed