Updated some files
Deleted unused modules