Remove logic in save method