notifications tvc code cleanup