Remove unused/unneded function