PLT-451 - Remove use of convention and security source

This PR removes use of convention and security source so that performance is improved.
Replaced with links so caching is applied correctly
Reformatted to match standards
Redundant code removed
The TODO is now not as clearly related to dataId as it was