Remove unused stuff, fix module name