Sujit: might have to undo this commit later on..
Sujit: removed unwanted references