Remove Carl's changes after devel branch