Removals, minor fixes