cleaning up a few last items'