Remove redundant imports
Remove un-needed Functor requirement, remove debug import