Asset constructor cleanup continued