MAVEN-89: Removed extraneous code, SF