Cleaned up some data type references

When they are in use I'll add them back in