Removed all unused references