Cleaned some warnings
Removed old test code
WIP
Got it to compile under 2.11 except for the runner