remove functionality working sort of