remove todo that is no longer required and function parameters that are never used