Remove warnings
Removed unused code, add TODO
Fix typo