Updated references, removing unused