Removed commented code and relevant method externalReferencesFor

A rebase of #31