Remove unused module and code