throw errors (should not be catched) in case of a problem
remove obsolete import; use variable where possible
fix missing return