Remove unfinished feature