remove some no longer needed unchecked casts