More type changes

Also deleted utilities stockpile since it was useless.