Xtext 2.5.1 (stable) and some clean-up
Code cleanup