Removed eval
Removed obsolete code
Changes