Removed some experimental code