doin the post-Velocity clean up