Got last couple of tests working
Remove obsolete code