Updated references & removed unused components