Cleaned up some vestigial code