Merging back to Master from Development branch - clean ups mainly