clean remnants from merge conflict
convert prints to 2.7 syntax