Merge final clean up on master

Merging final changes on master