Removed some experimental code (again...)