don't leave TODO's in production ready code, remove the remaining cases or implement them