Feature #4977: Clean up functions in AssetsManager