Added todo
Removed unused method