2014 10 09 Cleaned up a lot of logging