Removed logging lines
Refactured loading architecture and added clone checking