remove unused code
remove empty return
remove sto import