Some update
 - Removed unused References
 - Removed all the "already specified" Types