Removed references that are not used anymore