Removed unecessary explicit types and unused imports