Improved reference assignment on Component, remove unused assets