cleanup unwanted modules
fixed some stuff