removed useless props

Conflicts:

	pom.xml