Removal of unnecessary datatypes