Remove unused modules
CS fixes