spec cleanup in progress...