Removed useless modules
Updated modules