Removed temporary cboyd branch and associated files