Fixed function overwrite
In case function is already implemented in extended model generator based on resource property overwrites it which should not be the case.
Removed junk files