Cleaned Up
Removed references