Remove unsupported and unwanted modules
Add more logging