#U4-2238 Fixed

Moved some methods around, made them internal, removed cleaning of tags as that's already done by cleaning each property