Further small edits and removals

still needs testing