Mavenize, update to newer Factions builds, cleanup and simplify code