Cleaning up while trying to figure out why commands do not work.