Delete unused module
Improve the master selector
Remove unused testbench