Remove unused functionality