small fixes and removals