Getting rid of unnecessary legacy + start on add resource and restrictions