CLEANUP: remove unwanted cast