Removed all to merge master