remove unused methods, add TODO
Merge remote-tracking branch 'origin/develop'