Add back certain modules and remove update feature