Removed TODO comments and unused stubs