Some rectifications + Deleting unused modules