Removed functionality that should not be present in basic branch