Merge update
Minor updates

Remove unneeded line