Removed lots of unused references