remove obsolete modules
clean up defines