Add logic for namespace cleanup and Serial

Add logic for namespace cleanup and Serial #1357