further cleaning up
back to normal after some meddling around with git merge