Cleaned up some experimental code