Rename module
Remove unused/dead code