Merge "Delete keystores from models"