Added back in arguments and post-uv cleanup