Removed some val types