More removals and changes