fixed asset handling and commented dead code