Add quick fix for SingularField
Remove unused code