Cleaned up some unnecessary dross