Removed Todos and unused properties that caused Warnings.