Removed unused referenes, Notes added