Baltimore cleaning up

more here

and here