Minor fixes

This PR contains some minor fixes and removals that should not affect any other code.