Removed unnecessary sets
Added dev note for later