Update for Cloudspace MBP
Clean up dis-used files and update set_links