Beta Stage
Remove unuses