Cleaning up some of the older, no longer used, code
More clean up