Issue 6361 license manager cleanup

Cleaned up for now.