Remove headers
Fix model reference

Lost changes from commit:

https://github.com/nativelogix/xquerrail2.framework/commit/0d358275c45edc42c664d15cfa3fe88a824fbdbb