Removing some unecessary expiremental code