removed some deprecated stuff and failed experiments