removed eval'd code