Remove unused funtions