Remove additional ExecutionContext casts which are now not needed