Remove old methods
Remove add/remove/set methods
Rename variables