remove unused building methods
add a few parameters into XML