fixed defined_in_script
fixed defined_in_script
removed commented code