DAR-1184: small code cleanup
DAR-1184: optional assets loading