Cleanup comments and unused #include
Create load state, add asset management
Merge branch 'develop'