Changes/Cleanup Nov 2013