more clean-ups
removed unused import
bug fix