Removing prop calls