TUNE-4446 Code/Doc cleanup