Cleaned up experimental code