Fixes: #2974 Removing unused functions