cleanup, sorry for the premature pull request, but this is really the final time