Unused use statement should be avoided
Removed some TODOs in code