fixed timeout passing; remove amdee dependence