Remove unfinished functional